bitkeeper revision 1.1159.183.18 (41a87b9botUUH_NddW8aKYPTDKH6Fg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Sat, 27 Nov 2004 13:05:31 +0000 (13:05 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Sat, 27 Nov 2004 13:05:31 +0000 (13:05 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


Trivial merge